IOMMU/x86: correct page_list_first() use
authorJan Beulich <jbeulich@suse.com>
Tue, 3 Feb 2015 10:38:22 +0000 (11:38 +0100)
committerJan Beulich <jbeulich@suse.com>
Tue, 3 Feb 2015 10:38:22 +0000 (11:38 +0100)
Comparing its result against NULL is unsafe when page lists use normal
list entries for linking together - page_list_empty() needs to be used
instead.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Tim Deegan <tim@xen.org>
xen/drivers/passthrough/x86/iommu.c

index ce0ca5aa39a9de25bc3ebcf16efbd91f86376de4..52d89482b89091d51de78f0814990a7ec60ea1c9 100644 (file)
@@ -85,8 +85,9 @@ int arch_iommu_populate_page_table(struct domain *d)
          * first few entries.
          */
         page_list_move(&d->page_list, &d->arch.relmem_list);
-        while ( (page = page_list_first(&d->page_list)) != NULL &&
-                (page->count_info & (PGC_state|PGC_broken)) )
+        while ( !page_list_empty(&d->page_list) &&
+                (page = page_list_first(&d->page_list),
+                 (page->count_info & (PGC_state|PGC_broken))) )
         {
             page_list_del(page, &d->page_list);
             page_list_add_tail(page, &d->arch.relmem_list);